Marine Body Spray AKA: Reworks Marine Orders #3782

CometBlaze · 2023-07-01T22:50:30Z

About the pull request

SLs are now able to pick between three kinds of body spray laced with experimental stimulants designed to improve the marines' combat performance.

On a more serious note this makes it so orders now act as a buff aura rather than a short power boost. In order to compensate for their now constant nature, the strength of the mobility and protection auras have been halved, focus has been left as is because it was already weak enough and honestly I would still like to make it stronger, but maybe in another PR.

For the majority of roles the changes end here, however, squads will see another aspect changed in the form of their FTLs. When an SL (or aSL) picks an order, all FTLs currently assigned to that squad will also emit that same aura. This aura has the same exact behaviour as the regular SL's orders with the only difference being that FTLs cannot pick their own orders.

Assuming the maintainer team doesn't shank me for how I coded this there will be a follow up to this PR introducing ~~fear RP~~ morale de-buffs to marines not within range of a "buff piece" (SL, FTL, CO, etc...)

Explain why it's good for the game

Provides marine with a mechanical incentive to stick with their SLs which should hopefully lead to better squad cohesion.
Increased squad cohesion should allow for more elaborate tactics to be employed by CIC which should lead to more interesting rounds.
Benefits to squad cohesion also apply to Fireteams, which should allow for even more flexibility in squad tactics.

Testing Photographs and Procedure

Screenshots & Videos

Put screenshots and videos here with an empty line between the screenshots and the <details> tags.

Bodyspray.mp4

Changelog

🆑 CometBlaze
add: Orders are now buff auras that apply to anyone within 7 tiles of the buff giver and no longer have limited duration.
balance: Mobility and Protection orders' strength have been halved, Focus remains unchanged.
add: FTLs now act as "order relays" for their SLs, meaning they will also have an aura like the SL, this aura has the same properties as the SL's and remains active for as long as theirs is.
code: Order action buttons have been brought into the modern age and now use a transparent action_icon_state
/:cl:

…octrine

Ben10083 · 2023-07-02T00:22:46Z

How does this affect defence placements like the warbanners?

ihatethisengine · 2023-07-02T08:09:02Z

I think spray should affect only their own squad, to discourage murderballing a bit (otherwise imagine Alpha Charlie Delta SLs sticking together to provide every kind of pheros). And FTL should relay orders only to their respective TL. I think this way it would be perfect.

sleepynecrons

sprites

nauticall

concur, sprites good

…octrine

github-actions · 2023-07-17T02:00:06Z

This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself

Zonespace27 · 2023-07-17T08:03:14Z

code/modules/mob/living/carbon/human/human_defines.dm

@@ -93,11 +93,13 @@
 	var/chem_effect_flags = 0
 	var/chem_effect_reset_time = 8

-	var/command_aura_available = TRUE // Whether or not you can issue an order
+	//var/command_aura_available = TRUE // Whether or not you can issue an order


don't comment out variables, remove them

Zonespace27 · 2023-07-17T08:03:34Z

code/modules/mob/living/carbon/human/human_defines.dm

+	var/current_aura = null //The aura we're currently emitting
+	var/aura_strength = 0 //Strenght of the aura we're emitting

-	var/mobility_aura_count = 0 //Used to track how many auras are affecting the human
-	var/protection_aura_count = 0
-	var/marksman_aura_count = 0
+	var/mobility_aura_new = 0 //Used to track how many auras are affecting the human
+	var/protection_aura_new = 0
+	var/marksman_aura_new = 0


code doc these 5 (or more, if you want)

Zonespace27 · 2023-07-17T08:04:05Z

code/modules/mob/living/carbon/human/human_damage.dm

@@ -408,7 +408,7 @@ This function restores all limbs.
 	permanent_kill = FALSE, mob/firer = null, force = FALSE
 )
 	if(protection_aura && damage > 0)
-		damage = round(damage * ((ORDER_HOLD_CALC_LEVEL - protection_aura) / ORDER_HOLD_CALC_LEVEL))
+		damage = round(damage * ((ORDER_HOLD_CALC_LEVEL - protection_aura * 0.5) / ORDER_HOLD_CALC_LEVEL))


are you certain this is doing what you want with PEMDAS?

Zonespace27 · 2023-07-17T08:04:44Z

code/modules/mob/living/carbon/human/powers/issue_order.dm

+		if(current_aura)
+			deactivate_order_buff(current_aura)
+			current_aura = null
+			visible_message(SPAN_WARNING("\The [src] stops issueing orders."), \


Zonespace27 · 2023-07-17T08:04:51Z

code/modules/mob/living/carbon/human/powers/issue_order.dm

+
+	if(order)
+		if(current_aura == order)
+			visible_message(SPAN_BOLDNOTICE("[src] whitdraws their order to [order]!"), SPAN_BOLDNOTICE("You withdraw your order to [order]!"))


Zonespace27 · 2023-07-17T08:07:05Z

code/modules/mob/living/carbon/human/life/handle_orders.dm

+			marine.handle_ftl_orders(marine)
+
+	if(aura_strength > 0)
+		for(var/mob/living/carbon/human/H as anything in GLOB.alive_human_list)


this is really expensive to call on every human every life() tick

it's more acceptable for xenoes bc they're rarely dealing with 30+ xenoes, but humans regularly breach 100, along with a not-exactly-free get_dist check

Zonespace27 · 2023-07-30T16:55:47Z

Ping me when you're ready to work on this again

CometBlaze added 4 commits July 1, 2023 15:45

forgor

b278af6

bodyspray achieved

0d3188e

Merge branch 'master' of https://github.com/cmss13-devs/cmss13 into d…

154e122

…octrine

lynx

747eab3

github-actions bot added Sprites Remove the soul from the game. Feature Feature coder badge Code Improvement Make the code longer labels Jul 1, 2023

sleepynecrons approved these changes Jul 2, 2023

View reviewed changes

sleepynecrons added the Sprites Approved confirmed no stray pixels label Jul 2, 2023

Zonespace27 self-assigned this Jul 5, 2023

Drulikar added the Balance You need to be a professional veteran game maintainer to comprehend what is being done here. label Jul 6, 2023

nauticall approved these changes Jul 8, 2023

View reviewed changes

cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Jul 8, 2023

CometBlaze added 2 commits July 9, 2023 10:58

Merge branch 'master' of https://github.com/cmss13-devs/cmss13 into d…

d513d44

…octrine

conflict_bgone

2c1d5e0

cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Jul 9, 2023

github-actions bot added the Stale beg a maintainer to review your PR label Jul 17, 2023

Zonespace27 reviewed Jul 17, 2023

View reviewed changes

Zonespace27 requested changes Jul 17, 2023

View reviewed changes

Zonespace27 removed the Stale beg a maintainer to review your PR label Jul 17, 2023

morrowwolf marked this pull request as draft July 19, 2023 05:46

cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Jul 24, 2023

Zonespace27 closed this Jul 30, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Marine Body Spray AKA: Reworks Marine Orders #3782

Marine Body Spray AKA: Reworks Marine Orders #3782

CometBlaze commented Jul 1, 2023 •

edited

Loading

Ben10083 commented Jul 2, 2023

ihatethisengine commented Jul 2, 2023

sleepynecrons left a comment

nauticall left a comment

github-actions bot commented Jul 17, 2023

Zonespace27 Jul 17, 2023

Zonespace27 Jul 17, 2023

Zonespace27 Jul 17, 2023

Zonespace27 Jul 17, 2023

Zonespace27 Jul 17, 2023

Zonespace27 Jul 17, 2023

Zonespace27 commented Jul 30, 2023

Marine Body Spray AKA: Reworks Marine Orders #3782

Marine Body Spray AKA: Reworks Marine Orders #3782

Conversation

CometBlaze commented Jul 1, 2023 • edited Loading

About the pull request

Explain why it's good for the game

Testing Photographs and Procedure

Changelog

Ben10083 commented Jul 2, 2023

ihatethisengine commented Jul 2, 2023

sleepynecrons left a comment

Choose a reason for hiding this comment

nauticall left a comment

Choose a reason for hiding this comment

github-actions bot commented Jul 17, 2023

Zonespace27 Jul 17, 2023

Choose a reason for hiding this comment

Zonespace27 Jul 17, 2023

Choose a reason for hiding this comment

Zonespace27 Jul 17, 2023

Choose a reason for hiding this comment

Zonespace27 Jul 17, 2023

Choose a reason for hiding this comment

Zonespace27 Jul 17, 2023

Choose a reason for hiding this comment

Zonespace27 Jul 17, 2023

Choose a reason for hiding this comment

Zonespace27 commented Jul 30, 2023

CometBlaze commented Jul 1, 2023 •

edited

Loading